accel map: Fix compiler warnings

Fix warnings due to -Wdeclaration-after-statement and -Wshadow.

diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index c3a196d2775e9bc811df6e0f3019a9fa2acd36bd..d5e53d35f729b9bbb80377c5b75e369e0a79647d 100644 (file)
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -132,7 +132,6 @@ enum {
 static GHashTable  *accel_entry_ht = NULL;     /* accel_path -> AccelEntry */
 static GSList      *accel_filters = NULL;
 static gulong      accel_map_signals[LAST_SIGNAL] = { 0, };
-static GtkAccelMap *accel_map;
 
 /* --- prototypes --- */
 static void do_accel_map_changed (AccelEntry *entry);
@@ -1021,10 +1020,12 @@ gtk_accel_map_class_init (GtkAccelMapClass *accel_map_class)
 }
 
 static void
-gtk_accel_map_init (GtkAccelMap *accel_map)
+gtk_accel_map_init (GtkAccelMap *map)
 {
 }
 
+static GtkAccelMap *accel_map;
+
 /**
  * gtk_accel_map_get:
  *